ci: Wrap calls with sudo when building toolbox

The mutter image now sets up a non-root default user, so we have
to wrap everything with sudo or su.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2806>

diff --git a/.gitlab-ci/build-toolbox-image.sh b/.gitlab-ci/build-toolbox-image.sh
index 2e07cb1311f3d5bd8b053f866572068fb98c9a5e..bd5e9e64a45dcd2a586f4d9ab853d32c4643f2af 100755 (executable)
--- a/.gitlab-ci/build-toolbox-image.sh
+++ b/.gitlab-ci/build-toolbox-image.sh
@@ -15,6 +15,10 @@ check_image_base() {
   [[ "$base" == "$MUTTER_CI_IMAGE" ]]
 }
 
+buildah_run() {
+  buildah run $build_cntr sudo "$@"
+}
+
 build_container() {
   echo Building $TOOLBOX_IMAGE from $MUTTER_CI_IMAGE
 
@@ -35,10 +39,10 @@ build_container() {
     abattis-cantarell-fonts # system font
     gnome-backgrounds # no blank background!
   )
-  buildah run $build_cntr dnf config-manager --set-disabled '*-modular,*-openh264'
-  buildah run $build_cntr dnf install -y "${extra_packages[@]}"
-  buildah run $build_cntr dnf clean all
-  buildah run $build_cntr rm -rf /var/lib/cache/dnf
+  buildah_run dnf config-manager --set-disabled '*-modular,*-openh264'
+  buildah_run dnf install -y "${extra_packages[@]}"
+  buildah_run dnf clean all
+  buildah_run rm -rf /var/lib/cache/dnf
 
   # work around non-working pkexec
   local fake_pkexec=$(mktemp)
@@ -52,7 +56,7 @@ build_container() {
   # it either asks for unlocking the login keyring on startup, or it detects
   # the running host daemon and doesn't export the object on the bus, which
   # blocks the activating service until it hits the timeout
-  buildah run $build_cntr rm /usr/share/dbus-1/services/org.freedesktop.secrets.service
+  buildah_run rm /usr/share/dbus-1/services/org.freedesktop.secrets.service
 
   local srcdir=$(realpath $(dirname $0))
   buildah copy --chmod 755 $build_cntr $srcdir/install-meson-project.sh /usr/libexec